From fa605895540aac6ab8c8bb886cef8446df98ba9b Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 18 Feb 2001 01:59:18 +0000 Subject: [PATCH] clean this up a bit. 2001-02-17 Havoc Pennington * gtk/gtkalignment.c (gtk_alignment_class_init): clean this up a bit. --- ChangeLog | 5 +++ ChangeLog.pre-2-0 | 5 +++ ChangeLog.pre-2-10 | 5 +++ ChangeLog.pre-2-2 | 5 +++ ChangeLog.pre-2-4 | 5 +++ ChangeLog.pre-2-6 | 5 +++ ChangeLog.pre-2-8 | 5 +++ gtk/gtkalignment.c | 84 ++++++++++++++++++++++++---------------------- 8 files changed, 78 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index e403b536b8..5e8f3f2bf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-02-17 Havoc Pennington + + * gtk/gtkalignment.c (gtk_alignment_class_init): clean this up a + bit. + 2001-02-17 Havoc Pennington * gtk/gtklabel.c (gtk_label_ensure_layout): fix screwup with diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e403b536b8..5e8f3f2bf0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-02-17 Havoc Pennington + + * gtk/gtkalignment.c (gtk_alignment_class_init): clean this up a + bit. + 2001-02-17 Havoc Pennington * gtk/gtklabel.c (gtk_label_ensure_layout): fix screwup with diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e403b536b8..5e8f3f2bf0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-02-17 Havoc Pennington + + * gtk/gtkalignment.c (gtk_alignment_class_init): clean this up a + bit. + 2001-02-17 Havoc Pennington * gtk/gtklabel.c (gtk_label_ensure_layout): fix screwup with diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e403b536b8..5e8f3f2bf0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-02-17 Havoc Pennington + + * gtk/gtkalignment.c (gtk_alignment_class_init): clean this up a + bit. + 2001-02-17 Havoc Pennington * gtk/gtklabel.c (gtk_label_ensure_layout): fix screwup with diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e403b536b8..5e8f3f2bf0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-02-17 Havoc Pennington + + * gtk/gtkalignment.c (gtk_alignment_class_init): clean this up a + bit. + 2001-02-17 Havoc Pennington * gtk/gtklabel.c (gtk_label_ensure_layout): fix screwup with diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e403b536b8..5e8f3f2bf0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-02-17 Havoc Pennington + + * gtk/gtkalignment.c (gtk_alignment_class_init): clean this up a + bit. + 2001-02-17 Havoc Pennington * gtk/gtklabel.c (gtk_label_ensure_layout): fix screwup with diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e403b536b8..5e8f3f2bf0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-02-17 Havoc Pennington + + * gtk/gtkalignment.c (gtk_alignment_class_init): clean this up a + bit. + 2001-02-17 Havoc Pennington * gtk/gtklabel.c (gtk_label_ensure_layout): fix screwup with diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c index 8d9cb05ee2..a01dc66584 100644 --- a/gtk/gtkalignment.c +++ b/gtk/gtkalignment.c @@ -84,55 +84,57 @@ gtk_alignment_get_type (void) static void gtk_alignment_class_init (GtkAlignmentClass *class) { + GObjectClass *gobject_class; GtkObjectClass *object_class; GtkWidgetClass *widget_class; + gobject_class = (GObjectClass*) class; object_class = (GtkObjectClass*) class; widget_class = (GtkWidgetClass*) class; - - g_object_class_install_property(G_OBJECT_CLASS(object_class), - PROP_XALIGN, - g_param_spec_float("xalign", - _("Horizontal alignment"), - _("Value between 0.0 and 1.0 to indicate X alignment"), - 0.0, - 1.0, - 0.5, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - - g_object_class_install_property(G_OBJECT_CLASS(object_class), - PROP_YALIGN, - g_param_spec_float("yalign", - _("Vertical alignment"), - _("Value between 0.0 and 1.0 to indicate Y alignment"), - 0.0, - 1.0, - 0.5, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - g_object_class_install_property(G_OBJECT_CLASS(object_class), - PROP_XSCALE, - g_param_spec_float("xscale", - _("Horizontal scale"), - _("Value between 0.0 and 1.0 to indicate X scale"), - 0.0, - 1.0, - 0.5, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - g_object_class_install_property(G_OBJECT_CLASS(object_class), - PROP_YSCALE, - g_param_spec_float("yscale", - _("Vertical scale"), - _("Value between 0.0 and 1.0 to indicate Y scale"), - 0.0, - 1.0, - 0.5, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - - G_OBJECT_CLASS(object_class)->set_property = gtk_alignment_set_property; - G_OBJECT_CLASS(object_class)->get_property = gtk_alignment_get_property; + + gobject_class->set_property = gtk_alignment_set_property; + gobject_class->get_property = gtk_alignment_get_property; widget_class->size_request = gtk_alignment_size_request; widget_class->size_allocate = gtk_alignment_size_allocate; + + g_object_class_install_property (gobject_class, + PROP_XALIGN, + g_param_spec_float("xalign", + _("Horizontal alignment"), + _("Value between 0.0 and 1.0 to indicate X alignment"), + 0.0, + 1.0, + 0.5, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + + g_object_class_install_property (gobject_class, + PROP_YALIGN, + g_param_spec_float("yalign", + _("Vertical alignment"), + _("Value between 0.0 and 1.0 to indicate Y alignment"), + 0.0, + 1.0, + 0.5, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (gobject_class, + PROP_XSCALE, + g_param_spec_float("xscale", + _("Horizontal scale"), + _("Value between 0.0 and 1.0 to indicate X scale"), + 0.0, + 1.0, + 0.5, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (gobject_class, + PROP_YSCALE, + g_param_spec_float("yscale", + _("Vertical scale"), + _("Value between 0.0 and 1.0 to indicate Y scale"), + 0.0, + 1.0, + 0.5, + G_PARAM_READABLE | G_PARAM_WRITABLE)); } static void -- 2.30.2